Revision: bazaar--devo--1.2--patch-11
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Wed Feb  2 09:02:32 GMT 2005
Standard-date: 2005-02-02 09:02:32 GMT
Modified-files: libarch/conflict-handling.c
    libarch/conflict-handling.h tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-14
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-15
    thelove@canonical.com/bazaar--devo--1.2--patch-11
Summary: Resolved still wasn't quite right. Added a lot of test cases and it definitely works (note: anything is always equal to anything|0)
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-14
   Now it really works, and the test cases prove it

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-15
   A LOT more test cases for resolved

